bitkeeper revision 1.1159.91.1 (41545490klPYsVC65RXTsROARJj8bw)

build 2.4 w/out blkdev frontend (e.g. for dom0)

diff --git a/linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/Makefile b/linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/Makefile
index 7474e71fb48d74745d031c93425f23fd5c872642..7f1b4a98fb6afcd7bcfe77bddb2f0da1c0e1ef02 100644 (file)
--- a/linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/Makefile
+++ b/linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/Makefile
@@ -1,8 +1,8 @@
 
 O_TARGET := drv.o
 
-subdir-$(CONFIG_XEN_NETDEV_FRONTEND) += frontend
-obj-$(CONFIG_XEN_NETDEV_FRONTEND)    += frontend/drv.o
+subdir-$(CONFIG_XEN_BLKDEV_FRONTEND) += frontend
+obj-$(CONFIG_XEN_BLKDEV_FRONTEND)    += frontend/drv.o
 
 subdir-$(CONFIG_XEN_PHYSDEV_ACCESS) += backend
 obj-$(CONFIG_XEN_PHYSDEV_ACCESS)    += backend/drv.o

diff --git a/linux-2.4.27-xen-sparse/drivers/block/ll_rw_blk.c b/linux-2.4.27-xen-sparse/drivers/block/ll_rw_blk.c
index a7f03c0fd585d872cdd3911f5f7d710863fb2b6b..605debf1284cc6843cf5735a4011e1a7785cab89 100644 (file)
--- a/linux-2.4.27-xen-sparse/drivers/block/ll_rw_blk.c
+++ b/linux-2.4.27-xen-sparse/drivers/block/ll_rw_blk.c
@@ -1626,7 +1626,7 @@ int __init blk_dev_init(void)
        jsfd_init();
 #endif
 
-#if defined(CONFIG_XEN)
+#if defined(CONFIG_XEN_BLKDEV_FRONTEND)
     xlblk_init();
 #endif